Stop using GTestDBus

It is causing tests to timeout when libraries we are using
leak bus connections, and it turns out our tests run fine
without a session bus.

diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c
index ee59c32851bac583d28a63ce7fed6762f6dc1784..15c9047a933d0d531b4ee712a1719ab5bc04bb85 100644 (file)
--- a/testsuite/gtk/defaultvalue.c
+++ b/testsuite/gtk/defaultvalue.c
@@ -469,9 +469,6 @@ main (int argc, char **argv)
 {
   const GType *otypes;
   guint i;
-  GTestDBus *bus;
-  GMainLoop *loop;
-  gint result;
   const char *display, *x_r_d;
 
   /* These must be set before gtk_test_init */
@@ -483,12 +480,6 @@ main (int argc, char **argv)
   display = g_getenv ("DISPLAY");
   x_r_d = g_getenv ("XDG_RUNTIME_DIR");
 
-  /* Create one test bus for all tests, as we have a lot of very small
-   * and quick tests.
-   */
-  bus = g_test_dbus_new (G_TEST_DBUS_NONE);
-  g_test_dbus_up (bus);
-
   if (display)
     g_setenv ("DISPLAY", display, TRUE);
   if (x_r_d)
@@ -515,18 +506,5 @@ main (int argc, char **argv)
       g_free (testname);
     }
 
-  result = g_test_run();
-
-  /* Work around the annoying issue that g_test_dbus_down is giving
-   * us an "Error while sending AddMatch" that comes out of an idle
-   */
-  loop = g_main_loop_new (NULL, FALSE);
-  g_timeout_add (1000, (GSourceFunc)g_main_loop_quit, loop);
-  g_main_loop_run (loop);
-  g_main_loop_unref (loop);
-
-  g_test_dbus_down (bus);
-  g_object_unref (bus);
-
-  return result;
+  return g_test_run();
 }

diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index fe26c31d3717a4ac3907ae543b6362f8a8a41ea6..bd26c83c2340e484b4a86daab8428dffa534663a 100644 (file)
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -130,7 +130,6 @@ main (int argc, char **argv)
 {
   const GType *all_types;
   guint n_types = 0, i;
-  GTestDBus *bus;
   gint result;
   const char *display, *x_r_d;
 
@@ -142,12 +141,6 @@ main (int argc, char **argv)
   display = g_getenv ("DISPLAY");
   x_r_d = g_getenv ("XDG_RUNTIME_DIR");
 
-  /* Create one test bus for all tests, as we have a lot of very small
-   * and quick tests.
-   */
-  bus = g_test_dbus_new (G_TEST_DBUS_NONE);
-  g_test_dbus_up (bus);
-
   if (display)
     g_setenv ("DISPLAY", display, TRUE);
   if (x_r_d)
@@ -189,8 +182,5 @@ main (int argc, char **argv)
 
   result = g_test_run();
 
-  g_test_dbus_down (bus);
-  g_object_unref (bus);
-
   return result;
 }